Skip to content

Conversation

@mgsharm
Copy link
Contributor

@mgsharm mgsharm commented Dec 9, 2025

  • Update Kernel 6.12 to 6.12.58-82.121
  • The 1002-Revert-kbuild-hide-tools-build-targets-from-external.patch was reworked because AL has backported an upstream fix (amazonlinux/linux@73a722a) that removes the LDFLAGS= override from the tools/ targets in the Makefile. Our patch needed to be updated to align with this change, as the context and line numbers have shifted.

Description of changes:

Patches that changed:
None
Patches that were dropped:
None
Patches that were added:
0119-drivers-amazon-net-Update-igb_uio.patch
0120-AL2023-6.12-Update-lustrefsx-to-2.15.6-fsx25-commit.patch

Testing done:

Check GH actions

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@mgsharm mgsharm marked this pull request as ready for review December 9, 2025 01:08
# Use latest-kernel-srpm-url.sh to get this.
url = "https://cdn.amazonlinux.com/al2023/blobstore/1f9a0e4340695bd79eeda126295b4e9e75844ce4af246f88b514a084d7826f72/kernel6.12-6.12.55-74.119.amzn2023.src.rpm"
sha512 = "a7b7558da84e61427e2d372fc0a8ed096a11d6efa04b57a4920087a13098e2985c8533a99cb34c045c14ea2894698df9ee1056dab3b12229b76ae69ba0cd8343"
url = "https://cdn.amazonlinux.com/al2023/blobstore/1f9a0e4340695bd79eeda126295b4e9e75844ce4af246f88b514a084d7826f72/kernel6.12-6.12.58-82.121.amzn2023.src.rpm"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't seem to work for me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@mgsharm mgsharm force-pushed the update_2025-12-08_6.12 branch from ed97169 to 928522a Compare December 9, 2025 01:54
@mgsharm mgsharm force-pushed the update_2025-12-08_6.12 branch from 928522a to 8204ffc Compare December 9, 2025 02:01
@@ -1,4 +1,4 @@
From 05a7163507930b56804896818c80e92a2454ef4d Mon Sep 17 00:00:00 2001
From cfede7055134b412d9c7a293b9064ca89a19f3d1 Mon Sep 17 00:00:00 2001
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 1002-Revert-kbuild-hide-tools-build-targets-from-external.patch was reworked because AL has backported an upstream fix (amazonlinux/linux@73a722a) that removes the LDFLAGS= override from the tools/ targets in the Makefile. Our patch needed to be updated to align with this change, as the context and line numbers have shifted.

@mgsharm mgsharm merged commit 9a33ee9 into bottlerocket-os:develop Dec 9, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants